fix: remove log & data separation from base_local_service #4563
+28
−67
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
pr/internal
area/local/invoke
jfuss
reviewed
Jan 13, 2023
| @@ -81,7 +82,7 @@ def service_response(body, headers, status_code): | |||
|
|
|||
| class LambdaOutputParser: | |||
| @staticmethod | |||
| def get_lambda_output(stdout_stream): | |||
| def get_lambda_output(stdout_stream: io.BytesIO) -> Tuple[str, bool]: | |||
There was a problem hiding this comment.
I wonder if NamedTuple or a Dataclass would provide better readability and typing. I would not block on this but just stood out to me with the update.
There was a problem hiding this comment.
I do agree it would be better, but I didn't want to introduce more changes to this PR, I've only added some typing into the functions that is been changed.
| lambda_response = stdout_data[last_line_position:].strip() | ||
|
|
||
| lambda_response = lambda_response.decode("utf-8") | ||
| lambda_response = stdout_stream.getvalue().decode("utf-8") |
There was a problem hiding this comment.
Do we still need the rstrip(b"\n") after the getvalue? We had it there before but not sure if it is strictly required anymore.
There was a problem hiding this comment.
I've confirmed this by running local integration tests (some of them confirms the output of the command). So I believe we don't need that particular line
jfuss
approved these changes
Jan 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue(s) does this change fix?
#4296
#3770
Why is this change necessary?
Before switching to use AWS Lambda RIE,
sam localcommands was trying to parse the output in STDOUT and were trying to distinguish the log messages vs the response of the lambda function.With switching to AWS Lambda RIE, function response is now gathered through an API call and written to STDOUT here
and function logs are written to STDERR in this thread. With this change, only function response is written to STDOUT and only function logging is written to STDERR.
How does it address the issue?
By removing the special logic to parse STDOUT in order to distinguish the logs with actual function response.
What side effects does this change have?
N/A
Mandatory Checklist
PRs will only be reviewed after checklist is complete
make prpassesmake update-reproducible-reqsif dependencies were changedBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.